(image-mode-maybe): Prevent magic-mode-alist from

interfering with attempt to set major mode from modified
auto-mode-alist.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 3e10afcbfeba548cfd9ab15a58b0e35d4dfb8380..13a689b606144c8bcb24b8c98f5e1d7e7f242651 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -105,7 +105,8 @@ information on these modes."
                         elt))
                     auto-mode-alist))))
     (if (assoc-default buffer-file-name mode-alist 'string-match)
-       (let ((auto-mode-alist mode-alist))
+       (let ((auto-mode-alist mode-alist)
+             (magic-mode-alist nil))
          (set-auto-mode)
          (image-minor-mode t))
       (image-mode))))